removed some comments
merged