Added cirr/non-cirr inputs