Commit some progress on the third problem of ps5