checked usage of verify methods and fixed if needed