This check is now functional
Cleaned up some methods