still tweaking...