updated with more OTA stuff