More messing around with completion