completion improvements