major upgrade to 1.0.7