complete restructure, more fading