Updated some of my functions