removed all calls to unit to value