Refactored to use new methods