Improve check in