Trying to fix CheckIn stuff