minor changes in 6 and 7