Initial working version for comments