added production mode
merge