Improving a bit - nerob