Moving stuff around added some features.