Slightly improved base file