Changed Structure code