More design changes #2