Removed grep and updated tail