Adjust features in master