Adding convert and several other past changes