Further design changes