Fixed the previous bugs, regolfed, 1023b!