A little bit more looks and more tweaking by config