-- minor modifications for publication