Initial attempt to improve the performances