Buffing Improvements