Changed design
Further design changes