Modify some code for Risoluto2