Changed some singles to composites.