Update structure. Working again on mac