added new functions, new data