Did some changes for system check