Switched to new conversion (advised not to use until all of the unit tests are completed)