Edited Some of the classes