Updated to match currents specs