refactor for the new goo.im account