Updated for Moolah's additions