Updating comments and added final path