More viable moves improvements