upgraded packages
Upgraded packages, removed zombie support.
Test refactoring.