forgot some changes
merged