added and modified two files