Some final tweaking