Merge Add Bill changes to personal fork