changing to fit with 0.8