adding some conditions for new classes