New feature added and fixed