last changes for fanaddict