Added all other pep options