Updated back to version 2