epic updates and macklemore fix