Continued work on bug 1020457