prepared for 0.7