started work on bug 843004 - patch part 1