Continued work on bug 1005263