Commit nr2 - TA3 - WIP