Merge Bill changes to personal fork