pocean's commit 7