Advanced version to 1.0.0