making few more changes