Basically cleaned up parallel version