ahaa fix this up