little bit of tweaking

wil be continued...