advanced version to 0.6.0