Completion Assignment 2 - 2nd submission