Customizations of original repo