Updated .h and .cpp