Done. Modified for using class names.