Fixed logic with over ride