edge and firstrun added