Debug: added comments
merged changes from different servers