Added temporary conversion step