more: Remove first, then add, it's cleaner that way