Trying to fix CRUD