Added latest changes before going home... :D