Made some changes to different classes