added stuff
merged