Preparing to put it on production