almost done with handling check