Small design changes in detailed