Changes by Gijs-Jan