Updated to include adaptive design features