tidied up manifest