Revised full spec version