Add scaling
Improve conversion