Updates after troubleshooting on prototype