Updated with new methods