Upsert now works