Checking to fix all issues