Implementation of 2 additional helper functions made everything work great :)