Changed Check method
many changes