added more pap input