revised on 8May