Final changes from icewind1991