Latest from base

Updated fork with updates in base