Added Fan's stuff