fine tunning 0.9.2.4