Updated some stuff on functions