refactored and modified Manifest