Upgrading: Bug Fixing, Features addition