Update to 1.8 OP system, moved methods back to User