Completed the implementation of SRT and HPF.