Refactored to use update-enter pattern instead of enter-remove