remove
Add correct checker