Geting back Jean-Pierre changes and fixing manifest