Standardise on check-in

#31886