Updated to the new method structure