Updated buffer moves