replaced aliased values with original for very minor speedup
removed value functions