moved methods in correct order