Updating to new spec
Fixing conflict