forgot to remove two comments