Played with some more helper functions