added, and modified 1-7