i added more stuff
merged