Updated to match new spec