changed some behaviors