Making it work a bit nicer.