Final Functionality changes
final design changes draft