New macros and updated example.