Make production ready

I've made this production ready for you.