bringing the vanilla build up to date