this seems to be working pretty consistently now