merge with design changes