Bug fix
Working fulfillment + minor updates - still need improvements