Change from delegate_method to actual methods