reworked component to include remarks