Upgraded to Paradise 2.0.0-M6