Updated to latest specs