Changed from echo behavior to return