6529 CORE Feedback by @prxt0