DF-2975 cancels almost fixed. still have somme issues with scroll