Lot of stuff, close to v1.0