Back to ugly last measurement update, no dedicated function