alignment with changes for itsatrap