Separated more code.