Add to list and fixes #3