Move to 0.6