bc
design fixes
design fixes
quickfix