Prepare for release (take 2)