removed fan, added takuya