firt branch and modified simon file