Updated to version 2