commited the latest changes according to last feedback