added some lines back in