adding changes from guardianproject