adding classes and fixing required