done with some more changes ... could you please check it?