Update #7

Update for 1.5