Merge Bill changes into personal fork