minor modifications ...