otimizations?
just a fewchanges