diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f2a57a8c..11ed004e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-project(GOMC_Serial)
+project(GOMC)
 
 include_directories(lib)
 include_directories(src)
diff --git a/Change log b/Change log
index 2b019048b..8e352c129 100644
--- a/Change log	
+++ b/Change log	
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.0] - 6/11/2017
++ NPT added
++ GPU implementation has been added to the project
+
 ## [1.9] - 12/12/2016
 + Revision on output. We now only generate one output file.
 + Bug fixes
diff --git a/GOMC_Manual.pdf b/GOMC_Manual.pdf
index b0a6bf9bc..9f962fb50 100644
Binary files a/GOMC_Manual.pdf and b/GOMC_Manual.pdf differ
diff --git a/README.md b/README.md
index 960e09eec..38e92ce40 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Current Release: 1.9 (12/12/2016)
+Current Release: 2.0 (6/11/2017)
 
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/GOMC_WSU/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
 
diff --git a/makefile b/makefile
deleted file mode 100644
index 19884ebaa..000000000
--- a/makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-################################################################################
-#
-# Copyright 1993-2012 NVIDIA Corporation.  All rights reserved.
-#
-# NOTICE TO USER:   
-#
-# This source code is subject to NVIDIA ownership rights under U.S. and 
-# international Copyright laws.  
-#
-# NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE 
-# CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR 
-# IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH 
-# REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF 
-# MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.   
-# IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
-# OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-# OR PERFORMANCE OF THIS SOURCE CODE.  
-#
-# U.S. Government End Users.  This source code is a "commercial item" as 
-# that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting  of 
-# "commercial computer software" and "commercial computer software 
-# documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995) 
-# and is provided to the U.S. Government only as a commercial end item.  
-# Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through 
-# 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the 
-# source code with only those rights set forth herein.
-#
-################################################################################
-#
-# Build script for project
-#
-################################################################################
-
-# OS Name (Linux or Darwin)
-OSUPPER = $(shell uname -s 2>/dev/null | tr [:lower:] [:upper:])
-OSLOWER = $(shell uname -s 2>/dev/null | tr [:upper:] [:lower:])
-
-# Flags to detect 32-bit or 64-bit OS platform
-OS_SIZE = $(shell uname -m | sed -e "s/i.86/32/" -e "s/x86_64/64/")
-OS_ARCH = $(shell uname -m | sed -e "s/i386/i686/")
-
-# These flags will override any settings
-ifeq ($(i386),1)
-	OS_SIZE = 32
-	OS_ARCH = i686
-endif
-
-ifeq ($(x86_64),1)
-	OS_SIZE = 64
-	OS_ARCH = x86_64
-endif
-
-# Flags to detect either a Linux system (linux) or Mac OSX (darwin)
-DARWIN = $(strip $(findstring DARWIN, $(OSUPPER)))
-
-# Location of the CUDA Toolkit binaries and libraries
-CUDA_PATH       ?= /usr/local/cuda-8.0
-CUDA_INC_PATH   ?= $(CUDA_PATH)/include
-CUDA_LIB_PATH   ?= $(CUDA_PATH)/lib
-CUDA_BIN_PATH   ?= $(CUDA_PATH)/bin
-
-# Common binaries
-NVCC            ?= $(CUDA_BIN_PATH)/nvcc
-GCC             ?= gcc
-
-# Extra user flags
-EXTRA_NVCCFLAGS ?=
-EXTRA_LDFLAGS   ?=
-
-# CUDA code generation flags
-GENCODE_SM10    := -gencode arch=compute_10,code=sm_10
-GENCODE_SM20    := -gencode arch=compute_20,code=sm_21
-GENCODE_SM30    := -gencode arch=compute_30,code=sm_30 
-GENCODE_SM35    := -gencode arch=compute_35,code=sm_35
-GENCODE_FLAGS   :=  $(GENCODE_SM30) 
-
-# OS-specific build flags
-ifneq ($(DARWIN),) 
-      LDFLAGS   := -Xlinker -rpath $(CUDA_LIB_PATH) -L$(CUDA_LIB_PATH) -lcudart
-      CCFLAGS   := -arch $(OS_ARCH) 
-else
-  ifeq ($(OS_SIZE),32)
-      LDFLAGS   := -L$(CUDA_LIB_PATH) -lcudart
-      CCFLAGS   := -m32
-  else
-      LDFLAGS   := -L$(CUDA_LIB_PATH)64 -lcudart
-      CCFLAGS   := -m64
-  endif
-endif
-
-# OS-architecture specific flags
-ifeq ($(OS_SIZE),32)
-      NVCCFLAGS := -m32
-else
-      NVCCFLAGS := -m64
-endif
-
-# Debug build flags
-ifeq ($(dbg),1)
-      CCFLAGS   += -g
-      NVCCFLAGS += -g -G
-      TARGET    := debug
-else
-      TARGET    := release
-endif
-
-
-# Common includes and paths for CUDA
-INCLUDES      := -Ilib,lib/cub,src,src/GPU,src/cbmc -L/opt/cuda/sdk/C/lib64 -L/opt/cuda/lib64/ -lcudart -lcuda -O3 -w
-# Target rules
-all: build
-
-build: GOMC.out
-
-GOMC.out: 
-	$(NVCC) ./src/*.cpp ./src/GPU/*.cu ./src/cbmc/*.cpp $(NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -DGOMC_CUDA -DNDEBUG -rdc=true -lm -o GOMC.out
-
-run: build
-	./src
-
-clean:
-	rm -f GOMC.out