pic working - still work needs doing on main