Complete manifest OVERHAUL