added ability to toggle fade