Added echo and some name changes