Properly handle new stuff