a bit more tunning