created proper struct
add changes