Commans imporved and fixed