added new override machanism