Updated for overloading