#update - refactor