Add straight line shapes; use local scope