cleanup and now using latest version of jquery