see devnotes for my changes