Worked again on design