Updated CPP File