Second commit plus housekeeping