removed and added new classes