Implemented buff stacking