Modified both affix_stack.repy and baseaffix.repy