Only using discussed items. Should close #15