code changes to share common code with other commodities