more custom special casing for our project