added a few lines here and there