Updated for new remote