Refactored kiss buffering