Improve Overload system