proposal based on Pavel's PR and current BB