-- minor modifications