switched all echo's over to a raw view