Modification source code SWAN cycle 2