Bring inline with ModdedPA