some changes that i did not commited earlier