decline content refactored and bug fix