Added a bit of Regex in CheckIn