Some design changes..