Updated to new specs