Account class edited