some changes at State class