added rest of checks