Family Maths Challenge

This is the question for the family maths challenge this week: Use the 4 shapes to complete the grid so that the same shape does not appear twice:

(a). In a row

(b). In any column

(c). In either of the diagonals.

I did it by starting with the diagonals and making each column have a different shape.