updated for Spout 2