1.8 update - not yet fully tested.