updated the structure to make changes easier