Added fully-function input completion