dont know
merge?
added comments
fixed merge