Few improvment