resolving merge conflict
Added an attempt at tracking the usage of the configurator.