changed few more things