added lots of PAMM goodness