Some stuff is slightly more functional now.