a bit nicer now