Removed constants, usging full unit name instead of symbol