Re-added assignment 6