some fine tunning - still not quite there.