Adding code from 'default'