Edit to include Buffer