Updated with new specs