3rd commit, better self checking