converting to newer methods