Fixed much of the entanglement by packaging