Solution 2 written/tested