removed upg-first, added comments for options