removed echo and die()