added more customizations