added comments and removed conn