#5 and #6 done