Some work on the crates