some changes in handlers