Updated with changes from zoom-fade.