Few improvemts