Change to output ids only