Additions to IAP 6.570 project