Reverted conversion code will wait for Clint and Josh to notify me if they want it changed