tweaking and fixing