Some more design changes :P