final commit before christmas