Final changes before completion of DuffedUIv8