Simplify and fix guide by using -p default