New feature fix #1: self check-in enhancement