updated for 1.7