Functions work as supposed! :)

Tested with 2x main methods
Merge origin/master