Reverting back to verctorised CPU version