Updated with Joey changes