Added manual checking