Updated to include my functions