side comments moved to components