added #5 and #6