weird things were added; had to change it