chaged to work with Vuko's classes