added comments
merged with server