Some minor modifications to helper class 404
What the world needs is even more options