last commit before vmem.h changes