updated with some customization