Fixed CS
Reoredered constructor arguments