removed echo and added account type