bug fix3
design changes