some tweaking...