Updated: 001 -- 003 to use new syntax.