And here it is another round of tweaks