upconversion improvement. now handles all previously known issues