Slightly improved components