Updated from id to class