Removed spout. Tweaked few lines, and this is lab-commit. DO NOT USE.