New feature #1 self check-in enhancement