more of grill->lens migration