Modified for the first assignment