Some names variables has been changed 2