some design changes lol