Made additional changes