Updated with two new methods