Now adding checks