Combining and Improving on DWM2 and FAF