More NA comp assignment 2