updated with validity endpoints