made few more changes