Updated with changes in 1.1.7