Few improvments