This version fixed some issues with outputs.