removed echo statements for debug