Bug Fix - import from CGFeedback