Continued work on bug 1088192