Added Self Checking