Add #3 #4 and #6 feature