design changes
design bugfix