Author: Filip Zymek

Updated some code - more verbose