Remove echo statements now I know it works as intended