Leo Stein modifications merged into my local fork of xPand