started moving methods out of hot potato