Changes to WithoutDigi Branch