updating fade, adding flip