improved a little
added #6