added triangle, square waves