Update as per spec