factor fixes
merge
fix
conflict fixed
Prev and next buffer
merge