changes from serge