this is great, do we need to do this check on update as well as next?