Updated to use HyperList version 2