Added OUTPUT.a and OUTPUT.p functionality