ali's merge changes