advanced version to v1.0.1