changed default behavior; added --account switch