Minor changes
Design Changes