changed code struktur