Updates #1 #7 and #8