Finalizing crate rework