Restructured input as PERCORE, minor changes to analog to test