Adding back in YAW and hand drawn from LineDrawer