andbucci Updated Functions and Data