Made additional customization changes