added in sliding div, will finish later
fixedmerge conflict