changed structure
Sources modified