Better updating of valid and current and so on