hand merge #5 and #6