added comments and id deletion removed