Structure update and closes #4