Removed usage of echo