WASPI scheme update