Changes in AmirBranch

lets make them merged