Changed enter/update logic