Change 'return' to 'echo' & change some other things (still not working)