3rd commit, pipe issue fixed