removed code for passive mode
separate the biggest class