Improve completion system