Updated for signals/slots