CHANGE: some important changes