adding triangleandsquare