updated for 1.5