#70 port latest changes