Change to two public slots