design changes as per Joe