Updates for specs
All finished