Update girlpower with latest addition/changes from unc and joreg