temp removal of oldBuffer code