Updated routines for new data