Added things after David change