added some customizations