Amended a bunch of helpers