and even more design changes and some of niki's shit