Bug fix and working on manifest