Slightly more comments