Version 1, excluding changes to delivery and tweaks by Long