Add some logic to control if the default is in place or not