Finished up the conversion