Upated Checks with all clases