Second commit. It is a bit nicer.