a bit of improvement in the CRUD