Working on finishing separator change.