I'm ready to make the changes to version 2.