more fina tuning ...heh