changing name and some architechture