updated to wintersmith 2