switched to v1.0 (some minor changes)