+1 to moving this to CVD controller