changing self to pushpop in module definition