all done - first version for production