made changes to incorporate different timepoints for different individuals