should all of these schema changes have been merged in?