lots of changes (Jacqueline)