now correctly handling checks