added more stuctrure