updated for 1.2