changed that last one back - decided I didn't like the added complexity