Fixing code to better support create on updates (really thinking we should undo that decision)