Updated to new spec