Sync with assignments 1-4