pull changes from legacy

will change to venture shortly