Updated files to include returns and other updates.