various changes from SCH competition