reverted back changes and imrpvoed after some bug with git