This surprised me a bit because of the previous implementation, but sounds good now.