Changing according the latest specs