Amended structure and setting up for checking.