Changed the way overload is handled