Lots of changes by Gombill