hmm, make sure this works with my changes