Small changes to working design