some changes in user logic