Updated .cpp files