Added locations to checks