Made a couple customizations