Added support for methods commented out in previous commit