Add more comments according to Christ's comment