added TJ and Daniels code