Added to list, bug fix, v1