Add -w and remove require of pp