Logical improvements