changed some of the helpers