made it truly case independent now