Updating to version 2, check dev-environment branch for changes