Updated with v1.8