Fixed and updated check list