Updated with new method