adding some more customizations