messing with finalize
Merge commit '99172f89493ddea7e0992d44453d1bcda302ba58'