Old changes from old plugin