Helper modified