Yavesh v1.1 - fixed q3