fadeaway includes from when I merged the three (I forgot them)

fixed