Heri | #3305 | Adding feedbacks after showcase