A little bit nicer now