added ability to switch off fades