after rebuilding a bit from scratch