Modifications, splitting off stuff
Merge branch 'nopull'