removed console log and changed a few things