some changes commited by ivan