All, I looked through my code and it looks quite okay. It looks like the NSAS has been merged into trunk since the ticket was re-based - not a big deal, just so we don't wipe things. -- Shane