Another Set of design changes