Changed methods to fit other methods