Updated flip to be separate to roll