Vanessa fix & Boris group fix to try