Changes to also show mesh in addition to points if needed