Structure update, incomplete and not working atm