Update Re-writing universal functions.js