updating with more comments