Adjusted version to 06.06.01