House keeping & update on manifest