changed: More improvements