added pipelining back in, oops