Pushing some tweaked version
Tweaks