Updated structure to make a bit more sense