Update pep to upstream
Hastily redo block organizational saving