Updated with location and device version 1