Added all the necessary checks