optimization update. fix the 'y templates' ... they suck