Overall structure simplified