Draft 2.5: Some changes that 'apparently' weren't added in draft 2