Few more tweaks... as always =)