changed some things
merged