fixing history
design changes