rearrange output
Bump version to 3.0