Updated version from development machine