tried to make a few changes