Made additions for the assignment