Copy&paste original back in place
Fix small issues
Return empty required field list