fyi when you migrated this, you dropped the comparison of _number between the two objects. Not sure if it was intentional; so I'm just letting you know.