Ape7 update

Address additional feedback