More design changes