reverted to johns version so that he will want to pull stuff from me in the future