- Further reworked edge moves