account model overhaul