Changes to helper file suggested by Roberto