Better, closer, warmer

@cvrebert Did we finally get it right? lol