Replaced bundled code with using six