Final Functionality changes