Removing old observer and adding a generic one instead