Moved methods + small changes