More design changes!