Two new aports

Two new aports for review/changes/approval