Feature/white handler