Actually move overlay close to after network op (as advertised in last commit)