Added volume and state changing