saveOrUpdate insted of just save , trying to prevent some troubles