modifications and customizations to work with our code base