Better (i.e. working) completion