Added options to work with PA pops, still needs work