started using fast.js and simplified things..