buffer issues fixed, reduced moves to 6