Updated for new methods