Made some changes
merged changes