minor mod
minor modifications