changed map to struct
adjust to not map but struct comparizon