forum - minor rework
forum rework