Added: Changed verify function to work with new functionality