Updated with better jquery and shim