Updated Check Class