updated for 1.3