ajustments on create and update