Finished new fade logic