Revert "Revert "Version 3.0""

This reverts commit fa2869d01c115c3091467355d522c6b1c2835f28.