Added code for first class