Manifest Changes

Do not merge just yet ... just sending a pull req at the moment