Updates

Optimizing functions.js