Refactor, change split to match.