Updated with Joey Changes