updated for 1.2 support