Updated with some override varibles