added some changes including simple form