updates to logic around remaining moves