Removed callback on line 87