final changes to conversion