Some more design changes..