And fix manifest ******again******