updated for net.coderanger.lulz version: 2