added #4 and #5