Advanced version to 0.1.1