ver2

updated comments and removed thick code