Updates for 1.9
Updates for 1.9