Changes made by Kjell Pinter (kpinter@smart-webparts.com).