Added double angle and M shapes