re-arrange fun/afun