Merged improvements