more minor modification