slimmed down, going to speed the whole thing up a ton