new parameters
new s
Merge branch 'master' of https://github.com/ByzanTine/WinterCompetition