refactored Buff initialization