some production adaptions