remove re-check and combine it with save