Please review this code and merge

oops, I didn't expand the folded code