Much faster, but pre-tidy check-in.
More tidying.