Updated some stuff under fun