Fixing things up a little, trying to make it a little easier for future pipeline