Feedback var fix + performance boost