modifications to work on production