tweaked two package choices