updated for 1.6