added better buffer controls