340 - This thing should run better