Refactor and save fix expanded to Receivers