Many changes, close to stable version