Comment views and logic updated