rough incorporation of fisheye; removed old_src  from main branch